From 3bb23ef2feceb96f06be4f1c2b36ab1e776f1e30 Mon Sep 17 00:00:00 2001 From: Ignacio Casal Quinteiro Date: Sat, 23 Jan 2016 14:32:32 -0800 Subject: [PATCH] win32 device manager: reorganize code to avoid prototypes --- gdk/win32/gdkdevicemanager-win32.c | 33 +++++++++++------------------- 1 file changed, 12 insertions(+), 21 deletions(-) diff --git a/gdk/win32/gdkdevicemanager-win32.c b/gdk/win32/gdkdevicemanager-win32.c index 8f38d516f1..97f738223d 100644 --- a/gdk/win32/gdkdevicemanager-win32.c +++ b/gdk/win32/gdkdevicemanager-win32.c @@ -66,29 +66,8 @@ static t_WTOverlap p_WTOverlap; static t_WTPacket p_WTPacket; static t_WTQueueSizeSet p_WTQueueSizeSet; - -static void gdk_device_manager_win32_finalize (GObject *object); -static void gdk_device_manager_win32_constructed (GObject *object); - -static GList * gdk_device_manager_win32_list_devices (GdkDeviceManager *device_manager, - GdkDeviceType type); -static GdkDevice * gdk_device_manager_win32_get_client_pointer (GdkDeviceManager *device_manager); - - G_DEFINE_TYPE (GdkDeviceManagerWin32, gdk_device_manager_win32, GDK_TYPE_DEVICE_MANAGER) -static void -gdk_device_manager_win32_class_init (GdkDeviceManagerWin32Class *klass) -{ - GdkDeviceManagerClass *device_manager_class = GDK_DEVICE_MANAGER_CLASS (klass); - GObjectClass *object_class = G_OBJECT_CLASS (klass); - - object_class->finalize = gdk_device_manager_win32_finalize; - object_class->constructed = gdk_device_manager_win32_constructed; - device_manager_class->list_devices = gdk_device_manager_win32_list_devices; - device_manager_class->get_client_pointer = gdk_device_manager_win32_get_client_pointer; -} - static GdkDevice * create_pointer (GdkDeviceManager *device_manager, GType g_type, @@ -793,6 +772,18 @@ gdk_device_manager_win32_get_client_pointer (GdkDeviceManager *device_manager) return device_manager_win32->core_pointer; } +static void +gdk_device_manager_win32_class_init (GdkDeviceManagerWin32Class *klass) +{ + GdkDeviceManagerClass *device_manager_class = GDK_DEVICE_MANAGER_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->finalize = gdk_device_manager_win32_finalize; + object_class->constructed = gdk_device_manager_win32_constructed; + device_manager_class->list_devices = gdk_device_manager_win32_list_devices; + device_manager_class->get_client_pointer = gdk_device_manager_win32_get_client_pointer; +} + void _gdk_input_set_tablet_active (void) { -- 2.30.2